Started working on unit testing