cleaned up schema declaration a little, added environment validation
new test data