Good hint with the AddCommand, that's in. As for removing track(), I'm reluctant as the use of track() and addToIndes() is wildly mixed all over the tests, and the parameter is File here and IFile there, so we need some bigger refactoring here.