Delete and update some test control files and address Map Legend class c...

...oding standard.