add more tests, closes #237