Clean up contact test a bit