Move tests to a mirroed structure