Rename test classes to be consistent
Merge remote-tracking branch 'origin/testinvoice' into meter-as-osgi-bundle