Added that fails
Removed failing test
Merge commit 'ed9dabee469579486f057584b86ac0e9e32618dc' into HEAD