Improvements to Invoice unit test (thanks to Paramesh Muthu)