new unit tests and other goodies