Updated file paths
Updated basic tests
Added some statechart traversing