Added unit testing for my changes.