Update report paths, refactor report xml for testing