Added even more tests and test classes.