Changed couple of workaround tests in baseline file