Removed configure_queue and refactored some tests and names