Updated tests to account for new formatting rules.