Small bug fix
Another bug fix

Another artifict from switching my original "UsingModuleScope" flag over to just saving a session state.  More tests passing now, but still breaks part-way through the Mock tests.  Will look into it later; really have to get moving now.