Move from tests

Fixes #160