Feature/contact test fix