Remove prints from tests
Add guard