Started writing unit tests