Fixing the tests a bit
Remove features
Removing more features
Merge branch 'feature/cleaning-up-features'
Renamed TODO to TODO.org