tests and tweaks