Changes for JDR tests
JDR: changes after review
Temp: try to improve tests