Unit tests are complete enough to merge