Failing tests
Some fixes in contacts