Cleaned up tests.
Merge branch 'development' of https://github.com/helmertz/achtung-die-klonen into development