Added test map & map movement