removing and adapting tests that don't work with initial sample data, as they add nothing
Merge branch 'test-dumbness'