Test codes - fixing finish client task bug...