[FEATURE] Clean up graph and update tests