Fixed

• Enhanced some internal-only APIs to allow for a better testing framework.