Updated tests

Update the tests