Tests: Clean up temporary files + minor code formatting enhancements