Merge pull request #1954 from cklosowski/release/2.0

Additional user purchase related unit tests
#1930 - Method of avoiding calling base64_* directly