Used a real mock solver instead of null pointers for testing.  Yes, a 'real mock solver'.  Oxymoron.