Test that error packets don't get remapped
Formatting updates