Started on the unit tests