Moved tests to tests/testhat for new convention

Fixes #2