Beginning to implement unit tests