Ot test2

This is a rebased version of  Ot test2 #122