Tests: broken tests #7 fix