Removed obsolete code.
Removed duplicate test setup