Tried adding some unit tests (needs adjusting)
Tried adding some unit tests (need adjusting)