Infrastructure tests

nit: sorted instead of ordered?