Refactoring tests according to the new schema