Resolving issue where tasks lost input. Updated tests so this can't happen again.