did guards and wrote new tests