make unit tests all pass