Fixes

Fixed all these files to work inside the test map.