Fixed up unit tests