Merge "Fixing up the tests."