Fix fsiargs and -d options - fixes #498 and fixes #500
Put optdata and sigdata into test folder