Went refactor-happy: yay test suites!