Invoice Writer amends + tests