Completed PushMap and Tests