Add more tests. Issue #8