Port the last of the tests over to lunatest