Changed tests structure