Updated tests again