Move test setup to the right place
Auto-merge remote-tracking branch 'upstream/master'