Isaac/bug fixes

1. Snapshots based on graph definition
2. Update integration tests