added additional tests to cover all data and modified models as needed to pass tests
Merge pull request #3 from smakhuli/master

Added Tests and Modified Models