Update remove_queue to allow removing from multiple queue collections
Move coverall config to top of test_helper