MAINT: added tests based on new functionality, currently failing