more small fixes or test updates