Add short test mode