Fix test files naming
Add Maestro card type recognition