Worked more on unit testing