Started implementing tests