Merge "Switch tests from nose to pytest"