Cleaned up SkyeTest Widgets
Ready for TT