Added acceptance tests, modifications on models and added some unit tests
Improve README file