Improving METplus Test Infrastructure and Code Quality