Fixed up unit testing framework