Fixed Conctacts compilation. Updated TestCases with headers.