Refactored SWT tests. Fixes #607

RedDeerTest.java marked as deprecated