More test stuff done.