code formatting and replace missing fixtures
removing redundant code
test coverage for queues
remove code/comments that is not needed.