More thorough unit tests