Add tests to yesterday's work. Strip collection view of most data.