Added 3 more test classes.