Updated tests hierarchy.