Queues reformat + JUnit tests
Cache reformat + JUnit tests