re-added tests (whoops)