Fixes a few bugs, adds test to Mr. Queue