Fixing broken tests after build configuration changed.