Update user commands and tests for recent changes in D8.