- More test map madness & rendering fixes