Updated tests to avoid errors