another try to fix integration and system tests