Enabling those tests back again