Formatting, more tests