fixed import issue
first unit tests
refactored happiness levels
Merge branch 'complete-data-model'