Issue #163: Convert test variables to state system.
Issue 163: Reseting static for states before retrieving e-mails.
Merge branch '163/test_email_collector' into 155/user_classes