Add tests; Fixes #3