Fixes to getDisplayString methods & start adding some tests. First attempt (unfinished, doesn't compile)
w/ ScalaMock.  A little refactoring also.
Move files.
wip: starting to use jmockit, unfinished/broken/will be forcibly overwritten.