rework the test here to suit 0.8/0.9 mostly, include time tests