Better gaurding and logging for tag testing