SAMZA-196; removing except and using scalatest instead