Added fresh_when to contacts
Changes to system_test and system