Reformat with 4 spaces
Add tests