REL-2015: Fixes and additional test dependencies.