Starting to add clever graph-based tests