Made some refactoring. Pull up common methods to MyTestBase class.
Remove deleted files