Working on unit testing