Enable tests to be run without running any UI tests

Also fixes checkstyle problems (come on guys, trailing whitespace?)
Merge pull request #98 from coldstar96/move-ui-tests

Enable tests to be run without running any UI tests