Fix test failing in release build
Remove excess quotes
Small refactoring & cleanup
Update test output