Fixup - milestone tests