changed tests structure.