Add approximate data test
Add parameters for approximate data
Add plot.py
Merge branch 'master' into approximate
Fix up and add new tests
Improve epsilon test