First pass at test clean up.