Cleanup
Version bump to 1.0.7
More tests