Tapefollowertest
fixed merge conflict