Added tests for ESBJAVA-3022