Additional tweaks, fixed some tests