Coding style fixes and testuite fixed