Re-added tests that somehow got removed