removed comments
updating the model and tests
added more unit tests