Restored options and code overwritten during merge.
Restored options and code overwritten during previous merge. Also, updated a few tests from STT-913 to include testing with score
Restored options and code overwritten during previous merge. Also, updated a few tests from STT-913 to include testing with score