Add Test to Queue and Correct bugs