Fix tests & Refactoring Customer#statement