More reworking of tests for generality