Make unit tests pass