Removing unused imports again.

This reverts commit 8fa2bc27dd27cf66b37628f3d0449930495c53b4.
removing some test scenarios and update methods