* Updated tests