Fixed default construct param in ClassMethods hydrator
Refactoring test naming and cleanup