more tests and tweaks to support them