More test clean up aiming for travis pass...