More bugfixes and handling the refund testing