Added contact and even more tests