More comments / tests