Change to the right directory after installing coverage before running the tests.
Merge remote-tracking branch 'upstream/master'