Update formatting and add test