api test assert normalization
Merge branch 'enhancements'