Changed expected values back to the ones from the SVN.