Tests - re-packaging