Refacored tests structure