Transferring tests over to new paradigm