Consider other credits in calculator

Spec for other credits
Fix calculator spec.