updated test suite
fixes #110
fixes #109
fix