Testing
Clean-up
Unit test Model