Removing remains of previous effort to unit test stuff.