unit tests now passing