[COMMIT] Update tests that have started failing because of changed design decisions.