All unit tests now pass