Tagged script tests with SCR20 per #70.
Normalized test definitions, moved options into options arguments. #130