Fixed tests for new schema