update tests
rewrite module

it's now safe.

fixes #1
fixes #2