Another short at fixing the test
Outdated code
Merge remote-tracking branch 'origin/master'