Add cleanup in tearDown, add new test files for other existing classes.

More to come..