Really minor refactor for consistency
Added more tests to make sure we're recursive