Plan invoice fixes. Plan invoice test outlined.
Lots of fixes.