Added unit test methods and classes.