heavy duty tests
test with pull-merge
remove old stuff
0.0.2