add remaining fixes for productive tests