1 new test and tweaks