allow override of model default selects

[circulon]

This PR addresses generating queries with cusom select criteria or aggregation while also defining default select criteria in the model

This moves the addition of the default select columns from the creating the initial builder instance in the model to the querybuilder where checking if the defaults are actually required is done instead.

Additional Cleanup:

• Removed some unused imports from tests
• Removed some unused commented out parameters from tests
• Sorted imports on some tests