Renamed indicator/file; added tests and new test params