Fix two unit tests, break one unit test