Adds threading test and tweaks GUI test
Merge GUI and thread stuff into master