code factor and test updates