change asserts in contact_tests in hamcrest style + some bug fixes