Tests

Added tests for models. 
Fix the indentation of the whole block.