Started implementing unit tests