GPAT-1247 - added support for advance tests such as diff