Updated test units