54361202 Fixed collection generation for Admin users.

Also, added a behave regression test.