Update: Even more testing