Further work on converting tests over