All unit tests now passing