Add basic tests and fix another bug.