Fix up test cases
Fix test cases
Fix prefix options passing to children