Adjusted schema validations, added tests