[COMMIT] Update tests/automated/ to reflect some changed design decisions.