fix tests after simplification