Fixed guard  bug - added user test & some validations