Re-add tests (rebaseme)