updates and test tweaks