Now payloads are only unzipped when they are zipped and fixed tests

Closes #556