Added more functionality to test classes.
Added more test classes and restructured test module.