Further changes in options for gsnap and changes to test data.