Withdrawal test and functionality added