Add new comprehensivness keys to test (commented out)