Created tasks for near future.
Moved test helpers to separate classes.