acu114903 [rs-base] Update kitchen tests for swap