Updated test for new schema