FIX avoid using sequences of sequences and fix tests