Some more text fixes and tweaks. Fixing integration tests.