Fix compile error in STS/Eclipse.

TestUtils exists in both s-i-test and in src/test... in
s-i-core.

Gradle import caused the file module to use the one in
core that was missing a method.

We should look at a better solution but for now, this
commit syncs the two versions.

Also polished to fix white space violations.
Merge pull request #778 from kdvolder/master

* TestUtils:
  Fix compile error in STS/Eclipse.