Adding more comprehensive tests to batch statements