Enabling some tests #6