Finished up one test. Need to write a few hundreds more.
Merge branch 'refs/heads/master' into feature-tests
Use guava.