Add testing tools
Add guard