Re-adding commented-out unit tests.