merged test fix from master