Unit tests now pass