Add guard for testing