Added unit tests for new classes.