Made tests conform to the coding style