#1108 - Updated tests to better utilize groovy syntax and practices