Fix request query string
Add initial amount and normal amount tests