Fixed up tests to use payload_entry. Also fixed up sandbox test to create app structure at build time as empty directories won't be handled by git