Created proper test classes.
Included main Module file for Tests.
Fixed inheritance issues with Test classes.
New test module.
Removed old test module.