(test) Increase service testing from 35% to 63%.

Significant refactoring and additions made to queueService.