Adding some functional queues. Improving some testing templates.