Merge "More changes to the test projects."