Refactoring tests for #171, as they are failing, and may not be fixed immediately