existing unit tests now passing again