Added unit tests around model