added tests and verfication into the schema