fix tabs & more ordering tests