Removed nino pattern matching so some tests had to be commented