Better style in tests
Test for verification token prolongation
Simplification of other tests