Adding queue tests back