post-merge for pull#148. Tagged as distributed on class level + adjusting of Auth.tests