Fix unit-tests to account for the doap tags added