add new tests
Merge branch 'happiness'