finish out 2.3.4 tests, some reworking