Fixed unit tests and coding standards