Updates some IDs for QA.
Correcting static path for unit tests.
Fixing merge conflict