RichardH : added more unit tests for Model