Removed redundant tests and consolidated the test classes.