Merge "Fix build - test issues."