add Guard, fix tests