SIGN IN SIGN UP

Merge test cleanup from 3.6

M
Martin Panter committed
930825bddc18cd2b361f70b953e28b32bc9a71c6