masterformat test failing on some platforms

Commit 00cc0b23 (part of 628-refactor-masterformat-system-test, MR !1180 (merged)) broke masterformat on several jenkins machines.

Two issues:

1. the dig command is malformed, with the @ parameter in the wrong place, which means the queries are being sent to the system resolver, not the server under test, and the system resolver isn't listening on $PORT
2. the last two records being queried for aren't named after their rrtypes, so the queries aren't going to work correctly regardless