refactor tests and assignment for non-AR scenarios