Formatting, test code updates