Close GH-4: Improve tests. Fixes #3