Add unused headers and unnecessary test_stop_app() calls