Cleanup test formatting