Swing tests

Cleaning up tests for desktop app. There are still 6 tests that do not pass.