Added tests and models