Update shoulds to expects in tests