implemented fix for Todo Explorer
implemented fix for testengine