Cleanup user input/output and tests