amount tests fixes