Upadtes to work with testing and verbose modes