Building a trailer so that it adheres to the new test is, apparently, not that difficult, and if you leave the lights as are then that part will obviously pass.
I've just built a little tear drop trailer, but luckily the test for home built little caravans comes in a bit later this year.
Gary