UC-testning, all passed, see comment

All the requirements for the app are now implemented. Testing done and
error handling working as expected, some refactoring needed.