Corrected branch master, now not included dev changesets.

Also, corrected a test.