Fixes setup task and unit test