Re-added tests