SPEED-1 Fix: add more test