#6: Separation of unit and integration tests - almost done -> not all
tests marked with proper test category