Updated a couple of tests