Removed tracing and fixed junit filenames