fix version
style fixes
cleanup a bit the unit tests