Adds queue utility for testing. Also refactors the testing files hierarchy for ease of addition of new tests