Enabling some tests #2