fixed compile errors
fixed test failures
Merge branch 'update-dependencies'