Move tests after return task of t feature

Relates to #260