Wrote new tests