Change should to expect in tests