more unit test clean up. somebody has to get these jokers into shape.