Fixing tests and lint errors
Merge pull request #68 from courageousillumination/fix_upload_rules

Fixing tests and lint errors