Fix NewCardStore _addAnswers invalid card id test
Use rewire for singletons