Various fixes and improvements + fixed tests
Version bump