We seem to have two unrelated things in here - a new test, and some additional fixes...

I don't mind when people attach new tests to pull requests that add fixes (or new features), but this is a Jira ticket to do with adding new tests... Feels like they should be split to me.