More tests and bug fixes
Add test for raw values in graph