expand tests; fix calling same task method twice