added tests
Added tests and models