Refactored DefaultMethodsTest a lot