changes needed for integration
0.1.0
fix tests