Improve super() handling
Try cutting down the number of test configurations