Re-added tests (see i told you)