Awesome :).  Gotta love when the tests enable a safe refactoring like this!