Formatting and more tests