Moved System Under Test definition to a new class outside the current module.
Cleaned up deprecated lines of code.
Some cosmetic alterations.