More consistent output formatting
Update tests for new method names