Duplicated test code removed.
Dependency on SWT and SWT Viewer class added.