Organized new tests, undid my commenting blunder in the schema