Adding in tests, doing some editing.