Tests fixed and passing.