Update the tests some more [note not currently working]