added comments
added special handling when errors running on test env