Fixing tests and coding standards