Made test files load order indipendent