Dependency updates, minor tweaks and plain text test.