Added unit testing for last commit