Refactored tests according to new schemas