Migrating and optimising test packages to new Integration/Units structure.