Prefer webstorm formatting
Add a few more tests