Advanced plan updates

TestUsage correctly executes for 'Advanced' plans
Usage int data types swapped to long to cater for advanced plan sizes