ENH : added new methods + generalized testing