Remove expect/equal