Refactor test graphs

Have tests pick up added graphs automatically