Added --short option to test.py