Added tests and support for .hash type models