fixes and test updates