Some changes so tests run against the real services (they do with 2 exceptions involving temp tokens sent to user's email
collectedOn --> collected_on (for consistency); adding user name validator; noting some unit values I've seen in recent CBCs.
Merge pull request #71 from alxdarksage/develop

Some changes so tests run against the real services