Merge "Add a couple more tests around bitmap uploads" into nyc-dev