Updated tests branch