Add more unit tests, sort out the breakage when tests against System.getProperty() turn out to be run in parallel.