refactored charge ability tests to use match