Added two new tests and removed un-needed/commented code from the test driver file.