Merge from MaxTests to Master Bug Fix

This is to fix the bug that previously was found in phase State. Please pull
as soon as possible to merge in.