minor twiddles, tests pass