Merge "Tests fixup"