updated tests to go back to transfer__ syntax and made defaults higher