some cleanup, extra tests