D-14493 Added spock functional tests
D-14493 Updated tests, code changes
D-14493 Standardized check using StringUtilities
D-14493 Pull request feedback
Merge pull request #644 from dmnjohns/D-14493

D-14493