Reworked the test decorators to match the test results on the buildbots.