Minor changes + new test map