fixed bitcoinaverage problem
fixed merchant test
modified balance calculation to exclude next fee