Removing TODOs and tweaking existing code.
Fix 5.3.3 build by reverting and modifying test response 'normalizing' for quotes.