+x on run_master.py
Bash-tag
Move tests into master dir