Retrieves better catalog counts and improves extension template

- Sorts by product ID before aggregating to get many products before the limit is reached
- Improves demo test classes in extension template