fixes fixed and test updates