Get unit tests to pass.