Some refactoring and another test passing