Expand payment card types enum to recognise Maestro card

Added ranges for Maestro card recognition. They are checked last, when no match find for other card. Also made range for MasterCard shorter since it covered part of Maestro range.

Also added test renames.