Cleaned up; Added a better smoke test.