Refactoring & Testing Object Class