(feat, fix) Implement niave user queue, fix broken tests

I've fixed the tests I broke in my original pull request. Tests passing locally. Please review and merge.