modified testMACQuery.py and MACQuery.py