Code formatting
Update tests to use