Fixes tests structure