--Updated tests