Add more bits to CLI to help with JUnit configuration