Formatting update

Streamlined the test formatting