fixed staging test errors