Clean up the testbed markup, while we're at it...
Clean up the testbed markup, while we're at it...

w3c/echidna,w3c/echidna,rrrene/echidna,catataw/echidna,catataw/echidna,catataw/echidna,rrrene/echidna,w3c/echidna,rrrene/echidna