jwveysey Syntax simplifications for test cases