Merge "Failing test cleanup." into gingerbread