No problem, it's not something you did wrong--it's that I didn't refactor tests after refactoring the code.

I will let you know when I've got things refactored and it's safe to edit.  Thanks!