unit tests now pass