Cleaning up output and changing defaults for testing,