Wrote new unit tests