Fixed test
Merge commit 'a52dfb9d69cfb4592624224bdff7ed8b01301cca'