I've not come across a marine test kit that had both. Salifert stuff is all separate. SeaChem marine basic doesn't have calcium kit included...they have a reef kit that has it, but I opt'd for the higher grade 'Reef Status' calcium kit they make.
__________________
Former advisor and planted tank geek...life's moved on though.
There is no need to go beyond NSW levels, 1.5-3 mEq/l (4.2-8.4 DKH). The only exception being cronic low pH issues that cannot be repaired environmentally.