Tests for ESBJAVA-3029 & sample 252 fixed