More tests for expect.fn and a bit of tweaks to the output