Add some new test data. Fix some parts of the application logic.
Merge branch 'create-test-data'
Add some test-data. Fix the application logic.