Advanced plan changes

TestUsage correctly executes for 'Advanced' plans
Usage int data types swapped to Int64, to cater for advanced plans