Fixed some configuration, open a gmail account for test and moved around some code