Enabling some tests #4