Test cleanup, fixes.