fix test with default data
make tests pass
more defaults for tests
Fix bug with cli lookup customer
Fix output of CLI lookup customer
Merge remote-tracking branch 'upstream/master' into upstream_merge