Still changing Mapping Gate

Making it easier to run test cases