Fix unit test
Simplified task api and small fixes
Release 1.0.4
Prepare for next development iteration