Tests refactoring: missed small things