added more graphs
modified simulation tests
merging