Cleanup.
Fixed unit tests.
Fixed unit tests.
Disabled not working tests.
Removed collection view controller tests, those have to be written from scratch.