unit tests now working