update for global testing, logging, added comments