Staging tests, fix for collecting from login (order of ops)