ticket:4 for #4 fixed tests as per reviewer comments
Merge branch 't4_cp'
ticket:4 for #4 fixed tests as per reviewer comments
Merge branch 't4_cp'
forgotten debug info