tests now passing