added options to binary, updated test to check for timeout