Further changes to expected test output