Moving property
Adding extra test for amount
Removing unused check
Adding extra check for validity