fixed up unit tests