Rewrite test for using OCHamrest instead GHUnit