Schema tests refactoring