Fix up tests and add an extra check to milestone validation
Merge branch 'hotfix/milestonetests'