replace junit tests, updated filenames