Add tests to nginx-smoke-test.py. Plus, clean up.