tweaks to terrence/convent-to-xctest branch