fix type synonym expansion
add SRS loop to test suit