Fix up Test project