Outcommented failing test.
Merge remote-tracking branch 'origin/rafael' into rafael