Add tests for bootstrap/add-system-defaults