Final version with test files