copied over tests and methods for instance class
final tests for new class
Merge branch 'invoices'