Further tests and tweaks