Updated test categories