Fixed and tightened some tests and improved use of shapes in integrate
class
Slackened accuracy required in test
Converted more methods to use dataset interface