Update formatting and tests