LPS-49233 import what you export
LPS-49233 fix versions and tests