Update tests and implementation to go hand in hand. Small cleanup.
Removed a whole bunch of tests specifying conditions for unchecked data,
that are not actually required by any part of the codebase.