#4137 more packaging
#4137 fixing tests