remerged changes to Constrast from master and fixed some test with new formatting of p-values