Refactoring destination class / tests