Wanted + Fixes (Test only)