all unit tests now passing