more tests, other tweaks