Move test.py back into test dir.