Tests don't need to be ran from test dir
Merge branch 'master' into bash