Restore test functionality