Fix CLI tests
Revert "Fix CLI tests"

This reverts commit 51455efd39ee0de1475722d761542963e8d2ff45.
Fix CLI tests
Task options override remote options now
Merge branch 'master' of https://github.com/anjlab/pushapp