Append fix and tests