Started working on unit tests