Clean up existing tests, add new tests, wrap code to 80 chars, bump version number