Tests, code style fixes and changelog gramar corrections