Change: Updated tests