Re-added old tests