Done fixing up unit tests