Modify test to not use tasks