OutputOracle bug solved;test updated to match new models