Enable some tests from 8b686695