changed relations for contact and added some more tests.