Refactorings made with Austin to put test runner for UI in test directory.
Merge remote-tracking branch 'origin/master'