fixing up unit tests