other minor refactors
Also includes other fixes for compiletest_rs failures, and a small reorg of tests