Working on all test files!