FIX: graph and unit test