Added schema enforcment and mroe test cases