Fixing dependency versions and fixing failed tests