Fix issue 1703428, test fixes, update dependencies