Unit tests now pass.