Adapting package structure in tests.