Fill out test suite. Fixes gh-2.