[Fixed Tests] Yekkanti - Fixed some failing tests