Simplified unit tests. Could be simplified further.