This was an experimental commit--added a couple of unit tests.