And add a test so that both layouts are tested. Move the test cube into a package. Related to #13001466.