Added some tests for model structure