Fix package structure in tests