Add test and guard