Refactor to make similar query tests easier to write
Refactored first save tests and added one for CreditCard