Fix some style related issues

- Prefer double quotes
- Correct some indentation
- Other misc things
Add a few more tests