UI test WORKS :D
Merge remote-tracking branch 'upstream/master'
Merge pull request #205 from rjynn/master

UI testing works :D