saltapi merge tests fixes