corresponding test updates
some non-critical fixes