use patch to not leak fake data
Reset singleton products on tests
main binary, command improvements, fixes from testing