changed tests structure