Added Janitor Tests