Added some more test classes.