updated test map, drop bugs fixed