more and more testing

Testing to more possible conditions in terms of minimizing surface
interval, depth and time