Add guard for tests
Merge branch 'Add_guard'