Remove old tests
Fix merge conflict
Merge branch 'development' of github.com:martijnbolhuis/task_system into development