Add tests file
Better coding style