Fixed broken test
Merge remote-tracking branch 'team/master'