re-add tests!