Refactor queue relative spec