Fixed queue issue, created test