GPII-784: Cleanup of code
GPII-941: Merged in latest changes from GPII-784
GPII-941: Moved the MM Utilities tests to be web-based