Merge branch 'list' into test
Added test for SortByQueueTime class
Merge branch 'test' into dev