Enforce coding style
Various v2 improvements
Some more tests