Two tests, one feature, and a bunch of refactoring