[Reviewer: Mike] Icscf test

Mike, can you please review these changes I've made while testing