Updated tests structure