Updated unit tests and a couple of class files