Enabling some tests #7