Improved Swing tests