Added tests and schemas