Update: improve test coverage (fixes #4)