Updated test files.
Merge branch 'consumer-bug' of https://github.com/hypower-org/physicloud into consumer-bug
Restructured task-builder function for simplicity.