updated tests. Fixes #5, #9