Fix Duplicate IDs in "target" folder after using Q7 Maven Plugin locally
Update tests for Luna.