Rework unit tests a little.