Enabling some tests #5